bitkeeper revision 1.1617 (429c8920BjgVBzWyVe6fs4GTiKD5Yw)

XendDomainInfo.py, XendDomain.py:
  tmp_restore_create_domain is vm_restore now.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 94c299c791ac993c5ab25f973e3d515f16c12af0..5c504897aa8a4942ba0b004e1927ab67002e19bd 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -312,8 +312,7 @@ class XendDomain:
         @param vmconfig: vm configuration
         """
         config = sxp.child_value(vmconfig, 'config')
-        dominfo = XendDomainInfo.tmp_restore_create_domain()
-        dominfo.dom_construct(dominfo.dom, config)
+        dominfo = XendDomainInfo.vm_restore(config)
         self._add_domain(dominfo)
         return dominfo
     

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index ddb9bcf8322df9686f960c19f14691f575df3f02..0dc1aae79c7265578dd43b7655fa6d345591b0bb 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -153,11 +153,14 @@ def vm_create(config):
     vm.construct(config)
     return vm
 
-def tmp_restore_create_domain():
-    # dom input parameter is ignored
+def vm_restore(config):
+    """Create a domain and a VM object to do a restore.
+
+    @param config:    domain configuration
+    """
     vm = XendDomainInfo()
     dom = xc.domain_create()
-    vm.setdom(dom)
+    vm.dom_construct(dom, config)
     return vm
 
 def vm_recreate(savedinfo, info):